X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=blobdiff_plain;f=phpcs.xml;h=92a218a1bbc48873d000230054d4d53496ce2f68;hb=b7e15c34a6d54fe1e0b54412e0f91d5a4805edd8;hp=440604ea1e4657d3ad41404c6dabbe418e8f7c50;hpb=16a9c7076f5eb5279d6eb1384751a08a4e33f532;p=lhc%2Fweb%2Fwiklou.git

diff --git a/phpcs.xml b/phpcs.xml
index 440604ea1e..92a218a1bb 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <ruleset name="MediaWiki">
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Generic.ControlStructures.InlineControlStructure" />
+		<!-- Rule will pass in 0.10.0 but update depends on T167168 -->
+		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeClassBrace.NoSpaceBeforeBrace" />
 		<!-- Disable rules added in 0.8.0 that don't pass yet -->
 		<exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
@@ -16,11 +19,7 @@
 		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart" />
 		<exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
 		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
-		<exclude name="MediaWiki.ExtraCharacters.ParenthesesAroundKeyword.ParenthesesAroundKeywords" />
 		<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
-		<exclude name="MediaWiki.WhiteSpace.DisallowEmptyLineFunctions.NoEmptyLine" />
-		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeControlStructureBrace.EmptyLines" />
-		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeClassBrace.NoSpaceBeforeBrace" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
 		<exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
@@ -37,21 +36,16 @@
 			<property name="ignoreList" type="array" value="$IP,$messageMemc,$parserMemc" />
 		</properties>
 	</rule>
-	<file>.</file>
-	<arg name="encoding" value="utf8"/>
-	<arg name="extensions" value="php,php5,inc,sample"/>
 	<rule ref="Generic.Files.LineLength">
 		<exclude-pattern>*/languages/messages/Messages*.php</exclude-pattern>
 	</rule>
 	<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
 		<exclude-pattern>*/includes/StubObject.php</exclude-pattern>
 	</rule>
-	<rule ref="Generic.ControlStructures.InlineControlStructure.NotAllowed">
-		<severity>0</severity>
-	</rule>
-	<rule ref="Generic.Formatting.NoSpaceAfterCast.SpaceFound">
-		<severity>0</severity>
-	</rule>
+	<file>.</file>
+	<arg name="bootstrap" value="vendor/mediawiki/mediawiki-codesniffer/utils/bootstrap-ci.php"/>
+	<arg name="encoding" value="UTF-8"/>
+	<arg name="extensions" value="php,php5,inc,sample"/>
 	<exclude-pattern>node_modules/</exclude-pattern>
 	<exclude-pattern>vendor/</exclude-pattern>
 	<exclude-pattern type="relative">^extensions/</exclude-pattern>